Skip to content

ADFA-3318: setup K2-based Kotlin LSP infra#1105

Merged
itsaky-adfa merged 19 commits into
stagefrom
fix/ADFA-3318-setup-K2-LSP-infra
Apr 17, 2026
Merged

ADFA-3318: setup K2-based Kotlin LSP infra#1105
itsaky-adfa merged 19 commits into
stagefrom
fix/ADFA-3318-setup-K2-LSP-infra

Conversation

@itsaky-adfa

@itsaky-adfa itsaky-adfa commented Mar 23, 2026 •
edited by atlassian Bot
Loading

Copy link
Copy Markdown
Contributor

@itsaky-adfa
fix: add ability to re-write class name references in desugar plugin
1b069cb 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
feat: integrate Kotlin analysis API
a70fd66 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
Merge branch 'stage' into fix/ADFA-3366-include-analysis-api-as-depen…
4ca1e97 
…dency
@itsaky-adfa
fix: update kotlin-android to latest version
43286a6 
fixes duplicate class errors for org.antrl.v4.* classes

Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa itsaky-adfa requested review from a team and Daniel-ADFA March 23, 2026 15:08
@itsaky-adfa itsaky-adfa self-assigned this Mar 23, 2026
@itsaky-adfa itsaky-adfa force-pushed the fix/ADFA-3318-setup-K2-LSP-infra branch 2 times, most recently from d26cfa5 to 77e5942 Compare March 24, 2026 16:50
@itsaky-adfa itsaky-adfa mentioned this pull request Mar 24, 2026
Merged
@itsaky-adfa
fix: remove UnsafeImpl
f1fe62f 
It is now included in the embeddable JAR (named UnsafeAndroid) with proper relocations.

Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
fix: update kotlin-android to latest version
6e6d8b3 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
fix: replace usages of Unsafe with UnsafeImpl
b208658 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
fix: make Kotlin LSP no-op
c844ad2 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
feat: configure K2 standalone session when setting up LSP
58db2cb 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
fix: JvmTarget resolution fails for input "21"
bf7acd1 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
fix: do not early-init VirtualFileSystem
dc62a51 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa itsaky-adfa force-pushed the fix/ADFA-3318-setup-K2-LSP-infra branch from 77e5942 to dc62a51 Compare March 25, 2026 10:33
@itsaky-adfa
fix: remove replaceClass desugar instruction for Unsafe
4b1c8e4 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@itsaky-adfa
fix: ensure boot class path is added as dependency to Android modules
b14f6ee 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
This was referenced Apr 1, 2026
Merged
Merged
@itsaky-adfa itsaky-adfa marked this pull request as ready for review April 15, 2026 04:22
@itsaky-adfa
fix: remove unused class
f5014bd 
Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
@coderabbitai

coderabbitai Bot commented Apr 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Warning

Rate limit exceeded

@itsaky-adfa has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 26 minutes and 10 seconds before requesting another review.

Your organization is not enrolled in usage-based pricing. Contact your admin to enable usage-based pricing to continue reviews beyond the rate limit, or try again in 26 minutes and 10 seconds.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 2df5fa3c-afba-432e-b5df-e79f7b5d0a46

📥 Commits

Reviewing files that changed from the base of the PR and between 724374d and 69a50a4.

📒 Files selected for processing (23)
  • assets/core.cgt
  • common/src/main/java/com/itsaky/androidide/app/configuration/IJdkDistributionProvider.kt
  • composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/DesugarReplacementsContainer.kt
  • git-core/build.gradle.kts
  • lsp/java/src/main/java/com/itsaky/androidide/lsp/java/providers/JavaDiagnosticProvider.kt
  • lsp/kotlin/build.gradle.kts
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/KotlinLanguageClientBridge.kt
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/KotlinLanguageServer.kt
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/KotlinServerSettings.kt
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/adapters/ModelConverters.kt
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/compiler/CompilationEnvironment.kt
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/compiler/CompilationKind.kt
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/compiler/Compiler.kt
  • lsp/kotlin/src/main/java/com/itsaky/androidide/lsp/kotlin/compiler/CompilerExts.kt
  • lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Definitions.kt
  • lsp/models/src/main/java/com/itsaky/androidide/lsp/models/References.kt
  • lsp/models/src/main/java/com/itsaky/androidide/lsp/models/Signatures.kt
  • plugin-api/build.gradle.kts
  • subprojects/kotlin-analysis-api/build.gradle.kts
  • subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/AndroidModule.kt
  • subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/JavaModule.kt
  • subprojects/projects/src/main/java/com/itsaky/androidide/projects/api/ModuleProject.kt
  • subprojects/projects/src/main/java/com/itsaky/androidide/projects/models/ActiveDocument.kt
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/ADFA-3318-setup-K2-LSP-infra

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@itsaky-adfa itsaky-adfa merged commit fb067ea into stage Apr 17, 2026
2 checks passed
@itsaky-adfa itsaky-adfa deleted the fix/ADFA-3318-setup-K2-LSP-infra branch April 17, 2026 16:56
jatezzz pushed a commit that referenced this pull request Jun 22, 2026
@itsaky-adfa
ADFA-3318: setup K2-based Kotlin LSP infra (#1105)
81625e0 
* fix: add ability to re-write class name references in desugar plugin
* feat: integrate Kotlin analysis API
* fix: update kotlin-android to latest version

fixes duplicate class errors for org.antrl.v4.* classes
* fix: remove UnsafeImpl

It is now included in the embeddable JAR (named UnsafeAndroid) with proper relocations.
* fix: update kotlin-android to latest version
* fix: replace usages of Unsafe with UnsafeImpl
* fix: make Kotlin LSP no-op
* feat: configure K2 standalone session when setting up LSP
* fix: JvmTarget resolution fails for input "21"
* fix: do not early-init VirtualFileSystem
* fix: remove replaceClass desugar instruction for Unsafe
* fix: ensure boot class path is added as dependency to Android modules
* fix: remove unused class
* fix: compilation error

Signed-off-by: Akash Yadav <akashyadav@appdevforall.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dara-abijo-adfa dara-abijo-adfa dara-abijo-adfa approved these changes
@Daniel-ADFA Daniel-ADFA Awaiting requested review from Daniel-ADFA

Assignees

@itsaky-adfa itsaky-adfa

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@itsaky-adfa @dara-abijo-adfa